From: Keir Fraser <keir@xensource.com>
Date: Sat, 31 Mar 2007 16:22:46 +0000 (+0100)
Subject: linux: Avoid use of ptep_get_and_clear_full name as it's a macro on
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15270^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=f24c3877e5504ce86e8c338b447aeda3b246b805;p=xen.git

linux: Avoid use of ptep_get_and_clear_full name as it's a macro on
some architectures.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/gntdev/gntdev.c b/linux-2.6-xen-sparse/drivers/xen/gntdev/gntdev.c
index 8716e8aa55..68f2555333 100644
--- a/linux-2.6-xen-sparse/drivers/xen/gntdev/gntdev.c
+++ b/linux-2.6-xen-sparse/drivers/xen/gntdev/gntdev.c
@@ -151,7 +151,7 @@ static pte_t gntdev_clear_pte(struct vm_area_struct *vma, unsigned long addr,
 
 static struct vm_operations_struct gntdev_vmops = {
 	.close = gntdev_vma_close,
-	.ptep_get_and_clear_full = gntdev_clear_pte
+	.zap_pte = gntdev_clear_pte
 };
 
 /* Global variables. */
diff --git a/linux-2.6-xen-sparse/include/linux/mm.h b/linux-2.6-xen-sparse/include/linux/mm.h
index 19654229cc..b46a6585b8 100644
--- a/linux-2.6-xen-sparse/include/linux/mm.h
+++ b/linux-2.6-xen-sparse/include/linux/mm.h
@@ -207,9 +207,8 @@ struct vm_operations_struct {
 	int (*page_mkwrite)(struct vm_area_struct *vma, struct page *page);
 	/* Area-specific function for clearing the PTE at @ptep. Returns the
 	 * original value of @ptep. */
-	pte_t (*ptep_get_and_clear_full)(struct vm_area_struct *vma, 
-					 unsigned long addr, pte_t *ptep, 
-					 int is_fullmm);
+	pte_t (*zap_pte)(struct vm_area_struct *vma, 
+			 unsigned long addr, pte_t *ptep, int is_fullmm);
 #ifdef CONFIG_NUMA
 	int (*set_policy)(struct vm_area_struct *vma, struct mempolicy *new);
 	struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
diff --git a/linux-2.6-xen-sparse/mm/memory.c b/linux-2.6-xen-sparse/mm/memory.c
index 4af5beccaa..2df16c2174 100644
--- a/linux-2.6-xen-sparse/mm/memory.c
+++ b/linux-2.6-xen-sparse/mm/memory.c
@@ -659,12 +659,9 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
 				     page->index > details->last_index))
 					continue;
 			}
-			if (unlikely(vma->vm_ops && 
-				     vma->vm_ops->ptep_get_and_clear_full))
-				ptent = vma->vm_ops->
-					ptep_get_and_clear_full(vma, addr,
-								pte,
-								tlb->fullmm);
+			if (unlikely(vma->vm_ops && vma->vm_ops->zap_pte))
+				ptent = vma->vm_ops->zap_pte(vma, addr, pte,
+							     tlb->fullmm);
 			else
 				ptent = ptep_get_and_clear_full(mm, addr, pte,
 								tlb->fullmm);